menu: Make final

diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index eec8b531b84d1357e6458569ee5b2c8161063313..c0d8f116a43fbbc3e9bf818965c631f6620f7020 100644 (file)
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -36,15 +36,10 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_MENU                  (gtk_menu_get_type ())
 #define GTK_MENU(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU, GtkMenu))
-#define GTK_MENU_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU, GtkMenuClass))
 #define GTK_IS_MENU(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU))
-#define GTK_IS_MENU_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU))
-#define GTK_MENU_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU, GtkMenuClass))
 
 
-typedef struct _GtkMenu        GtkMenu;
-typedef struct _GtkMenuClass   GtkMenuClass;
-typedef struct _GtkMenuPrivate GtkMenuPrivate;
+typedef struct _GtkMenu GtkMenu;
 
 /**
  * GtkArrowPlacement:
@@ -72,26 +67,6 @@ typedef enum
 typedef void (*GtkMenuDetachFunc)   (GtkWidget *attach_widget,
                                     GtkMenu   *menu);
 
-struct _GtkMenu
-{
-  GtkMenuShell menu_shell;
-
-  /*< private >*/
-  GtkMenuPrivate *priv;
-};
-
-struct _GtkMenuClass
-{
-  GtkMenuShellClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
 GDK_AVAILABLE_IN_ALL
 GType     gtk_menu_get_type              (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL

diff --git a/gtk/gtkmenuprivate.h b/gtk/gtkmenuprivate.h
index b0b0c41233e5ab14c0e353bccf83a3065fe02fd9..c8a029a28ccb7f8588e0043ca60b7230d61141e8 100644 (file)
--- a/gtk/gtkmenuprivate.h
+++ b/gtk/gtkmenuprivate.h
@@ -31,6 +31,21 @@
 
 G_BEGIN_DECLS
 
+typedef struct _GtkMenuClass   GtkMenuClass;
+typedef struct _GtkMenuPrivate GtkMenuPrivate;
+
+struct _GtkMenu
+{
+  GtkMenuShell menu_shell;
+
+  GtkMenuPrivate *priv;
+};
+
+struct _GtkMenuClass
+{
+  GtkMenuShellClass parent_class;
+};
+
 struct _GtkMenuPrivate
 {
   GtkWidget *parent_menu_item;

diff --git a/gtk/gtktreemenu.h b/gtk/gtktreemenu.h
index dc80a5d7e817161e683059585ee189344f0405c5..360a28dceb8cc7c90f3006296847b4375343a5a1 100644 (file)
--- a/gtk/gtktreemenu.h
+++ b/gtk/gtktreemenu.h
@@ -26,7 +26,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gtk/gtkmenu.h>
+#include <gtk/gtkmenuprivate.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkcellarea.h>